Use <multimon.h> when compiling with MSVC and old headers. (#126933, John

2003-12-08  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
	with MSVC and old headers. (#126933, John Ehresman)

diff --git a/ChangeLog b/ChangeLog
index f0d745803b7e0444307f6bad04dde021e8fbb206..964ad1fdff55c4fd262fc00f81b74bfbf1796861 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+       with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
         
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f0d745803b7e0444307f6bad04dde021e8fbb206..964ad1fdff55c4fd262fc00f81b74bfbf1796861 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+       with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
         
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f0d745803b7e0444307f6bad04dde021e8fbb206..964ad1fdff55c4fd262fc00f81b74bfbf1796861 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+       with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
         
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f0d745803b7e0444307f6bad04dde021e8fbb206..964ad1fdff55c4fd262fc00f81b74bfbf1796861 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+       with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
         
        * === Released 2.3.1 ===

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f0d745803b7e0444307f6bad04dde021e8fbb206..964ad1fdff55c4fd262fc00f81b74bfbf1796861 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-12-08  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkdisplay-win32.c: Use <multimon.h> when compiling
+       with MSVC and old headers. (#126933, John Ehresman)
+
 Mon Dec  8 10:54:44 2003  Owen Taylor  <otaylor@redhat.com>
         
        * === Released 2.3.1 ===

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 80441ca35ad6e3823032814898f039a11e088deb..546339d9c264fccc8c7de1f09932575a6006158c 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -21,6 +21,10 @@
 #include "gdk.h"
 #include "gdkprivate-win32.h"
 
+#if defined(_MSC_VER) && (WINVER < 0x500)
+#include <multimon.h>
+#endif
+
 typedef BOOL (WINAPI *t_EnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
 typedef BOOL (WINAPI *t_GetMonitorInfoA)(HMONITOR, LPMONITORINFO);